win32: Remove remaining uses of GdkScreen

diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index ea3e2dff574ac05ee69cbbd773935e3aa4a439ab..fa1eb191225407334dcc6fc278a6cbe189ee37d9 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -18,6 +18,7 @@
  */
 
 #include "gdkdisplayprivate.h"
+#include "gdkscreen-win32.h"
 
 #ifndef __GDK_DISPLAY__WIN32_H__
 #define __GDK_DISPLAY__WIN32_H__
@@ -59,7 +60,7 @@ struct _GdkWin32Display
 {
   GdkDisplay display;
 
-  GdkScreen *screen;
+  GdkWin32Screen *screen;
 
   Win32CursorTheme *cursor_theme;
   gchar *cursor_theme_name;

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index b917d65274d7a3d06014a37cba6eee6bd6b5fd55..b40c5b415776f1d20bfa0911d65af91ae5bca022 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -121,7 +121,7 @@
 #define GDK_DEBUG_EVENTS_OR_INPUT (GDK_DEBUG_EVENTS|GDK_DEBUG_INPUT)
 #define GDK_DEBUG_MISC_OR_EVENTS (GDK_DEBUG_MISC|GDK_DEBUG_EVENTS)
 
-GdkScreen *GDK_WINDOW_SCREEN(GObject *win);
+GdkWin32Screen *GDK_WINDOW_SCREEN(GObject *win);
 
 #define GDK_WINDOW_IS_WIN32(win)        (GDK_IS_WINDOW_IMPL_WIN32 (win->impl))
 
@@ -499,7 +499,7 @@ void _gdk_win32_window_delete_property (GdkWindow *window, GdkAtom    property);
 /* Stray GdkWin32Screen members */
 gboolean _gdk_win32_get_setting (const gchar *name, GValue *value);
 void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen);
-GdkWindow *gdk_win32_screen_get_root_window (GdkScreen *screen);
+GdkWindow *gdk_win32_screen_get_root_window (GdkWin32Screen *screen);
 GdkWindow *gdk_win32_display_get_root_window (GdkDisplay *display);
 
 /* Distributed display manager implementation */